277a593c5a3eed94fe2a8ab71ecc788441ff8b33,grouper-ws/grouper-ws-scim/src/main/java/edu/internet2/middleware/grouper/ws/scim/group/TierGroupService.java,TierGroupService,delete,#String#,220
Before Change
GrouperSession grouperSession = null;
try {
grouperSession = GrouperSession.startRootSession();
Group group = GroupFinder.findByUuid(grouperSession, id, false);
if (group == null && NumberUtils.isNumber(id)) {
group = GroupFinder.findByIdIndexSecure(Long.valueOf(id), false, null);
}
if (group == null) {
group = GroupFinder.findByName(grouperSession, id, false);
}
if (group == null) {
throw new UnableToDeleteResourceException(Status.NOT_FOUND, "group " + id + " not found.");
After Change
}
@Override
public void delete(String id) throws UnableToDeleteResourceException {
GrouperSession grouperSession = null;
try {
grouperSession = GrouperSession.startRootSession();
Group group = null;
if (id.startsWith("systemName:")) {
group = GroupFinder.findByName(grouperSession, id.substring(11), false);
}
if (id.startsWith("idIndex:")) {
if (NumberUtils.isNumber(id.substring(8))) {
group = GroupFinder.findByIdIndexSecure(Long.valueOf(id.substring(8)), false, null);
} else {
throw new UnableToDeleteResourceException(Status.BAD_REQUEST, "idIndex can only be numeric");
}
}
if (!id.startsWith("systemName:") && !id.startsWith("idIndex:")) {
group = GroupFinder.findByUuid(grouperSession, id, false);
}
if (group == null) {
throw new UnableToDeleteResourceException(Status.NOT_FOUND, "group " + id + " not found.");